diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs
index ef7a6235193..d9b1f5a3716 100644
--- a/compiler/rustc_query_impl/src/plumbing.rs
+++ b/compiler/rustc_query_impl/src/plumbing.rs
@@ -484,7 +484,7 @@ pub(crate) fn try_load_from_disk<'tcx, V>(
 
 fn force_from_dep_node<'tcx, Q>(query: Q, tcx: TyCtxt<'tcx>, dep_node: DepNode) -> bool
 where
-    Q: QueryDispatcher<'tcx, Qcx = QueryCtxt<'tcx>>,
+    Q: QueryDispatcher<'tcx, Qcx = QueryCtxt<'tcx>> + 'tcx,
 {
     // We must avoid ever having to call `force_from_dep_node()` for a
     // `DepNode::codegen_unit`:
@@ -517,7 +517,7 @@ pub(crate) fn make_dep_kind_vtable_for_query<'tcx, Q>(
     is_eval_always: bool,
 ) -> DepKindVTable<'tcx>
 where
-    Q: QueryDispatcherUnerased<'tcx>,
+    Q: QueryDispatcherUnerased<'tcx> + 'tcx,
 {
     let fingerprint_style = <Q::Dispatcher as QueryDispatcher>::Key::fingerprint_style();
 
diff --git a/compiler/rustc_query_system/src/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs
index 6cd259f4d3b..51ea938fb1f 100644
--- a/compiler/rustc_query_system/src/query/plumbing.rs
+++ b/compiler/rustc_query_system/src/query/plumbing.rs
@@ -117,11 +117,11 @@ fn default() -> QueryState<'tcx, K> {
 /// A type representing the responsibility to execute the job in the `job` field.
 /// This will poison the relevant query if dropped.
-struct JobOwner<'a, 'tcx, K>
+struct JobOwner<'tcx, K>
 where
     K: Eq + Hash + Copy,
 {
-    state: &'a QueryState<'tcx, K>,
+    state: &'tcx QueryState<'tcx, K>,
     key: K,
 }
 
@@ -171,7 +171,7 @@ fn handle_cycle_error<'tcx, Q>(
     }
 }
 
-impl<'a, 'tcx, K> JobOwner<'a, 'tcx, K>
+impl<'tcx, K> JobOwner<'tcx, K>
 where
     K: Eq + Hash + Copy,
 {
@@ -208,7 +208,7 @@ fn complete<C>(self, cache: &C, key_hash: u64, result: C::Value, dep_node_index:     }
 }
 
-impl<'a, 'tcx, K> Drop for JobOwner<'a, 'tcx, K>
+impl<'tcx, K> Drop for JobOwner<'tcx, K>
 where
     K: Eq + Hash + Copy,
 {
@@ -348,7 +348,7 @@ fn try_execute_query<'tcx, Q, const INCR: bool>(
     dep_node: Option<DepNode>,
 ) -> (Q::Value, Option<DepNodeIndex>)
 where
-    Q: QueryDispatcher<'tcx>,
+    Q: QueryDispatcher<'tcx> + 'tcx,
 {
     let state = query.query_state(qcx);
     let key_hash = sharded::make_hash(&key);
@@ -412,7 +412,7 @@ fn try_execute_query<'tcx, Q, const INCR: bool>(
 fn execute_job<'tcx, Q, const INCR: bool>(
     query: Q,
     qcx: Q::Qcx,
-    state: &QueryState<'tcx, Q::Key>,
+    state: &'tcx QueryState<'tcx, Q::Key>,
     key: Q::Key,
     key_hash: u64,
     id: QueryJobId,
@@ -812,7 +812,7 @@ pub enum QueryMode {
 #[inline(always)]
 pub fn get_query_non_incr<'tcx, Q>(query: Q, qcx: Q::Qcx, span: Span, key: Q::Key) -> Q::Value
 where
-    Q: QueryDispatcher<'tcx>,
+    Q: QueryDispatcher<'tcx> + 'tcx,
 {
     debug_assert!(!qcx.dep_context().dep_graph().is_fully_enabled());
 
@@ -828,7 +828,7 @@ pub fn get_query_incr<'tcx, Q>(
     mode: QueryMode,
 ) -> Option<Q::Value>
 where
-    Q: QueryDispatcher<'tcx>,
+    Q: QueryDispatcher<'tcx> + 'tcx,
 {
     debug_assert!(qcx.dep_context().dep_graph().is_fully_enabled());
 
@@ -852,7 +852,7 @@ pub fn get_query_incr<'tcx, Q>(
 
 pub fn force_query<'tcx, Q>(query: Q, qcx: Q::Qcx, key: Q::Key, dep_node: DepNode)
 where
-    Q: QueryDispatcher<'tcx>,
+    Q: QueryDispatcher<'tcx> + 'tcx,
 {
     // We may be concurrently trying both execute and force a query.
     // Ensure that only one of them runs the query.